From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 24 Jul 2011 22:16:20 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~857
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ccd80c5525ba298b055e43f83830e9090b9b1887;p=emacs.git

Merge from trunk.
---

ccd80c5525ba298b055e43f83830e9090b9b1887